merge trunk

diff --cc lisp/emacs-lisp/eieio.el
index f1fe9594fc0a22a6b431cd6c375464ce3a559736,352bd245ba4fe356d6df0b3269f90846b202eaa2..2975ba7cc683e48cbe410598f9ef0700d8e15cea
--- 1/lisp/emacs-lisp/eieio.el
--- 2/lisp/emacs-lisp/eieio.el
+++ b/lisp/emacs-lisp/eieio.el
@@@ -3051,7 -3051,7 +3051,7 @@@ Optional argument GROUP is the sub-grou
  \f
  ;;;### (autoloads (eieio-help-mode-augmentation-maybee eieio-describe-generic
  ;;;;;;  eieio-describe-constructor eieio-describe-class eieio-browse)
--;;;;;;  "eieio-opt" "eieio-opt.el" "1bed0a56310f402683419139ebc18d7f")
++;;;;;;  "eieio-opt" "eieio-opt.el" "4fb6625c3a007438aab4e8e77b6c73c2")
  ;;; Generated autoloads from eieio-opt.el
  
  (autoload 'eieio-browse "eieio-opt" "\

diff --cc lisp/mail/rmail.el
index 4b3441a8cdc366005d994458e09ce02f32b750c3,76c9b87f8814a747aebcc9049e34a3a11d7a15a6..34ad7c096215f77f16a119adc9684d92d4b7034b
--- 1/lisp/mail/rmail.el
--- 2/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@@ -4599,7 -4601,7 +4601,7 @@@ If prefix argument REVERSE is non-nil, 
  \f
  ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
  ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients rmail-summary-by-labels
--;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "3817e21639db697abe5832d3223ecfc2")
++;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" "4d1366228363803cd5b4fc60e7ad469e")
  ;;; Generated autoloads from rmailsum.el
  
  (autoload 'rmail-summary "rmailsum" "\